Don't rely on GNU C-ism of (null) output.

diff --git a/gpsbabel/reference/cet/cet-sample.cp1250.txt b/gpsbabel/reference/cet/cet-sample.cp1250.txt
index 0a59e0bc0bc5a269cc311563b9f52e16762caf1e..1645bac37a06c4da2b51cf62c4d3e5ac0cd5c419 100644 (file)
--- a/gpsbabel/reference/cet/cet-sample.cp1250.txt
+++ b/gpsbabel/reference/cet/cet-sample.cp1250.txt
@@ -1,17 +1,17 @@
 Group  sID     sDescription    fLat    fLong   fEasting        fNorthing       fAlt    iColour iSymbol sHyperLink
-new    01      Hohndorf        50.738297       12.683029                       -99999999.00    255     1       (null)
-new    0x9E    \9e - latin small letter z with caron     50.497971       13.027725                       -99999999.00    255     1       (null)
-new    0xC9    É - latin capital letter e with circumflex      50.497971       13.027725                       -99999999.00    255     1       (null)
-new    0xF0    ð - latin small letter eth (icelandic)  50.497971       13.027725                       -99999999.00    255     1       (null)
-new    CS      Ovládací Prohlí\9eení lokální síte        50.514406       13.638634                       -99999999.00    255     1       (null)
-new    DA      Tåning netværkssøgning áâãäåæéë 56.011734       9.847870                        -99999999.00    255     1       (null)
-new    DE      Himmelmühle äöüÄÖÜß     50.625865       13.060611                       -99999999.00    255     1       (null)
-new    EO      Trasercado de la loka ret       50.495281       13.027645                       -99999999.00    255     1       (null)
-new    ES      Matalascañas Navegación Táliga  37.007446       -6.558838                       -99999999.00    255     1       (null)
-new    FR      Boissière-École Contrôle  réseau Mâle   48.679047       1.652069                        -99999999.00    255     1       (null)
-new    HR      Pregledavanje lokalne mre\9ee     50.477937       12.510391                       -99999999.00    255     1       (null)
-new    HU      Hõgyész Vezérlõközpont Hálózat  46.491394       18.424072                       -99999999.00    255     1       (null)
-new    IS      Borgarfjörður   65.522461       -13.823547                      -99999999.00    255     1       (null)
-new    SK      Ovládacie centrum       50.724214       13.524871                       -99999999.00    255     1       (null)
-new    X1      \9eðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       (null)
-new    X2      \9eðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       (null)
+new    01      Hohndorf        50.738297       12.683029                       -99999999.00    255     1       
+new    0x9E    \9e - latin small letter z with caron     50.497971       13.027725                       -99999999.00    255     1       
+new    0xC9    É - latin capital letter e with circumflex      50.497971       13.027725                       -99999999.00    255     1       
+new    0xF0    ð - latin small letter eth (icelandic)  50.497971       13.027725                       -99999999.00    255     1       
+new    CS      Ovládací Prohlí\9eení lokální síte        50.514406       13.638634                       -99999999.00    255     1       
+new    DA      Tåning netværkssøgning áâãäåæéë 56.011734       9.847870                        -99999999.00    255     1       
+new    DE      Himmelmühle äöüÄÖÜß     50.625865       13.060611                       -99999999.00    255     1       
+new    EO      Trasercado de la loka ret       50.495281       13.027645                       -99999999.00    255     1       
+new    ES      Matalascañas Navegación Táliga  37.007446       -6.558838                       -99999999.00    255     1       
+new    FR      Boissière-École Contrôle  réseau Mâle   48.679047       1.652069                        -99999999.00    255     1       
+new    HR      Pregledavanje lokalne mre\9ee     50.477937       12.510391                       -99999999.00    255     1       
+new    HU      Hõgyész Vezérlõközpont Hálózat  46.491394       18.424072                       -99999999.00    255     1       
+new    IS      Borgarfjörður   65.522461       -13.823547                      -99999999.00    255     1       
+new    SK      Ovládacie centrum       50.724214       13.524871                       -99999999.00    255     1       
+new    X1      \9eðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       
+new    X2      \9eðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       

diff --git a/gpsbabel/reference/cet/cet-sample.latin1.txt b/gpsbabel/reference/cet/cet-sample.latin1.txt
index f7cf4ef30cbc076627da6dca60f9cb84ab6bd09f..80efa7d2365d76a2e5dc7c5ac26c2578c9976e01 100644 (file)
--- a/gpsbabel/reference/cet/cet-sample.latin1.txt
+++ b/gpsbabel/reference/cet/cet-sample.latin1.txt
@@ -1,17 +1,17 @@
 Group  sID     sDescription    fLat    fLong   fEasting        fNorthing       fAlt    iColour iSymbol sHyperLink
-new    01      Hohndorf        50.738297       12.683029                       -99999999.00    255     1       (null)
-new    0x9E    $ - latin small letter z with caron     50.497971       13.027725                       -99999999.00    255     1       (null)
-new    0xC9    É - latin capital letter e with circumflex      50.497971       13.027725                       -99999999.00    255     1       (null)
-new    0xF0    ð - latin small letter eth (icelandic)  50.497971       13.027725                       -99999999.00    255     1       (null)
-new    CS      Ovládací Prohlí$ení lokální síte        50.514406       13.638634                       -99999999.00    255     1       (null)
-new    DA      Tåning netværkssøgning áâãäåæéë 56.011734       9.847870                        -99999999.00    255     1       (null)
-new    DE      Himmelmühle äöüÄÖÜß     50.625865       13.060611                       -99999999.00    255     1       (null)
-new    EO      Trasercado de la loka ret       50.495281       13.027645                       -99999999.00    255     1       (null)
-new    ES      Matalascañas Navegación Táliga  37.007446       -6.558838                       -99999999.00    255     1       (null)
-new    FR      Boissière-École Contrôle  réseau Mâle   48.679047       1.652069                        -99999999.00    255     1       (null)
-new    HR      Pregledavanje lokalne mre$e     50.477937       12.510391                       -99999999.00    255     1       (null)
-new    HU      Hõgyész Vezérlõközpont Hálózat  46.491394       18.424072                       -99999999.00    255     1       (null)
-new    IS      Borgarfjörður   65.522461       -13.823547                      -99999999.00    255     1       (null)
-new    SK      Ovládacie centrum       50.724214       13.524871                       -99999999.00    255     1       (null)
-new    X1      $ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       (null)
-new    X2      $ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       (null)
+new    01      Hohndorf        50.738297       12.683029                       -99999999.00    255     1       
+new    0x9E    $ - latin small letter z with caron     50.497971       13.027725                       -99999999.00    255     1       
+new    0xC9    É - latin capital letter e with circumflex      50.497971       13.027725                       -99999999.00    255     1       
+new    0xF0    ð - latin small letter eth (icelandic)  50.497971       13.027725                       -99999999.00    255     1       
+new    CS      Ovládací Prohlí$ení lokální síte        50.514406       13.638634                       -99999999.00    255     1       
+new    DA      Tåning netværkssøgning áâãäåæéë 56.011734       9.847870                        -99999999.00    255     1       
+new    DE      Himmelmühle äöüÄÖÜß     50.625865       13.060611                       -99999999.00    255     1       
+new    EO      Trasercado de la loka ret       50.495281       13.027645                       -99999999.00    255     1       
+new    ES      Matalascañas Navegación Táliga  37.007446       -6.558838                       -99999999.00    255     1       
+new    FR      Boissière-École Contrôle  réseau Mâle   48.679047       1.652069                        -99999999.00    255     1       
+new    HR      Pregledavanje lokalne mre$e     50.477937       12.510391                       -99999999.00    255     1       
+new    HU      Hõgyész Vezérlõközpont Hálózat  46.491394       18.424072                       -99999999.00    255     1       
+new    IS      Borgarfjörður   65.522461       -13.823547                      -99999999.00    255     1       
+new    SK      Ovládacie centrum       50.724214       13.524871                       -99999999.00    255     1       
+new    X1      $ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       
+new    X2      $ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       

diff --git a/gpsbabel/reference/cet/cet-sample.latin2.txt b/gpsbabel/reference/cet/cet-sample.latin2.txt
index a10be2a1df7b23c5b1a6cedf63982365db898c7b..0db84c227a93d9d7c4b0ac68e05840dcfabb12cc 100644 (file)
--- a/gpsbabel/reference/cet/cet-sample.latin2.txt
+++ b/gpsbabel/reference/cet/cet-sample.latin2.txt
@@ -1,17 +1,17 @@
 Group  sID     sDescription    fLat    fLong   fEasting        fNorthing       fAlt    iColour iSymbol sHyperLink
-new    01      Hohndorf        50.738297       12.683029                       -99999999.00    255     1       (null)
-new    0x9E    ¾ - latin small letter z with caron     50.497971       13.027725                       -99999999.00    255     1       (null)
-new    0xC9    É - latin capital letter e with circumflex      50.497971       13.027725                       -99999999.00    255     1       (null)
-new    0xF0    ð - latin small letter eth (icelandic)  50.497971       13.027725                       -99999999.00    255     1       (null)
-new    CS      Ovládací Prohlí¾ení lokální síte        50.514406       13.638634                       -99999999.00    255     1       (null)
-new    DA      Tåning netværkssøgning áâãäåæéë 56.011734       9.847870                        -99999999.00    255     1       (null)
-new    DE      Himmelmühle äöüÄÖÜß     50.625865       13.060611                       -99999999.00    255     1       (null)
-new    EO      Trasercado de la loka ret       50.495281       13.027645                       -99999999.00    255     1       (null)
-new    ES      Matalascañas Navegación Táliga  37.007446       -6.558838                       -99999999.00    255     1       (null)
-new    FR      Boissière-École Contrôle  réseau Mâle   48.679047       1.652069                        -99999999.00    255     1       (null)
-new    HR      Pregledavanje lokalne mre¾e     50.477937       12.510391                       -99999999.00    255     1       (null)
-new    HU      Hõgyész Vezérlõközpont Hálózat  46.491394       18.424072                       -99999999.00    255     1       (null)
-new    IS      Borgarfjörður   65.522461       -13.823547                      -99999999.00    255     1       (null)
-new    SK      Ovládacie centrum       50.724214       13.524871                       -99999999.00    255     1       (null)
-new    X1      ¾ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       (null)
-new    X2      ¾ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       (null)
+new    01      Hohndorf        50.738297       12.683029                       -99999999.00    255     1       
+new    0x9E    ¾ - latin small letter z with caron     50.497971       13.027725                       -99999999.00    255     1       
+new    0xC9    É - latin capital letter e with circumflex      50.497971       13.027725                       -99999999.00    255     1       
+new    0xF0    ð - latin small letter eth (icelandic)  50.497971       13.027725                       -99999999.00    255     1       
+new    CS      Ovládací Prohlí¾ení lokální síte        50.514406       13.638634                       -99999999.00    255     1       
+new    DA      Tåning netværkssøgning áâãäåæéë 56.011734       9.847870                        -99999999.00    255     1       
+new    DE      Himmelmühle äöüÄÖÜß     50.625865       13.060611                       -99999999.00    255     1       
+new    EO      Trasercado de la loka ret       50.495281       13.027645                       -99999999.00    255     1       
+new    ES      Matalascañas Navegación Táliga  37.007446       -6.558838                       -99999999.00    255     1       
+new    FR      Boissière-École Contrôle  réseau Mâle   48.679047       1.652069                        -99999999.00    255     1       
+new    HR      Pregledavanje lokalne mre¾e     50.477937       12.510391                       -99999999.00    255     1       
+new    HU      Hõgyész Vezérlõközpont Hálózat  46.491394       18.424072                       -99999999.00    255     1       
+new    IS      Borgarfjörður   65.522461       -13.823547                      -99999999.00    255     1       
+new    SK      Ovládacie centrum       50.724214       13.524871                       -99999999.00    255     1       
+new    X1      ¾ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       
+new    X2      ¾ðÉéÀàÈèÙùÂâÊêÎîÄäËëÖöÜüÆæÅåØøÇçÑñ²³½É× 50.497971       13.027725                       -99999999.00    255     1       

diff --git a/gpsbabel/reference/cet/cet-sample.macroman.txt b/gpsbabel/reference/cet/cet-sample.macroman.txt
index 75cfcd7bdd0439dfb7b22b053688421867c5af4a..b4168878854f17286004a152de6a08caff95c4b7 100644 (file)
--- a/gpsbabel/reference/cet/cet-sample.macroman.txt
+++ b/gpsbabel/reference/cet/cet-sample.macroman.txt
@@ -1,17 +1,17 @@
 Group  sID     sDescription    fLat    fLong   fEasting        fNorthing       fAlt    iColour iSymbol sHyperLink
-new    01      Hohndorf        50.738297       12.683029                       -99999999.00    255     1       (null)
-new    0x9E    $ - latin small letter z with caron     50.497971       13.027725                       -99999999.00    255     1       (null)
-new    0xC9    \83 - latin capital letter e with circumflex      50.497971       13.027725                       -99999999.00    255     1       (null)
-new    0xF0    ð - latin small letter eth (icelandic)  50.497971       13.027725                       -99999999.00    255     1       (null)
-new    CS      Ovl\87dac\92 Prohl\92$en\92 lok\87ln\92 s\92te        50.514406       13.638634                       -99999999.00    255     1       (null)
-new    DA      T\8cning netv¾rkss¿gning \87\89\8b\8a\8c¾\8e\91 56.011734       9.847870                        -99999999.00    255     1       (null)
-new    DE      Himmelm\9fhle \8a\9a\9f\80\85\86§     50.625865       13.060611                       -99999999.00    255     1       (null)
-new    EO      Trasercado de la loka ret       50.495281       13.027645                       -99999999.00    255     1       (null)
-new    ES      Matalasca\96as Navegaci\97n T\87liga  37.007446       -6.558838                       -99999999.00    255     1       (null)
-new    FR      Boissi\8fre-\83cole Contr\99le  r\8eseau M\89le   48.679047       1.652069                        -99999999.00    255     1       (null)
-new    HR      Pregledavanje lokalne mre$e     50.477937       12.510391                       -99999999.00    255     1       (null)
-new    HU      H\9bgy\8esz Vez\8erl\9bk\9azpont H\87l\97zat  46.491394       18.424072                       -99999999.00    255     1       (null)
-new    IS      Borgarfj\9arður   65.522461       -13.823547                      -99999999.00    255     1       (null)
-new    SK      Ovl\87dacie centrum       50.724214       13.524871                       -99999999.00    255     1       (null)
-new    X1      $ð\83\8eË\88é\8fô\9då\89æ\90ë\94\80\8aè\91\85\9a\86\9f®¾\81\8c¯¿\82\8d\84\96²³½\83× 50.497971       13.027725                       -99999999.00    255     1       (null)
-new    X2      $ð\83\8eË\88é\8fô\9då\89æ\90ë\94\80\8aè\91\85\9a\86\9f®¾\81\8c¯¿\82\8d\84\96²³½\83× 50.497971       13.027725                       -99999999.00    255     1       (null)
+new    01      Hohndorf        50.738297       12.683029                       -99999999.00    255     1       
+new    0x9E    $ - latin small letter z with caron     50.497971       13.027725                       -99999999.00    255     1       
+new    0xC9    \83 - latin capital letter e with circumflex      50.497971       13.027725                       -99999999.00    255     1       
+new    0xF0    ð - latin small letter eth (icelandic)  50.497971       13.027725                       -99999999.00    255     1       
+new    CS      Ovl\87dac\92 Prohl\92$en\92 lok\87ln\92 s\92te        50.514406       13.638634                       -99999999.00    255     1       
+new    DA      T\8cning netv¾rkss¿gning \87\89\8b\8a\8c¾\8e\91 56.011734       9.847870                        -99999999.00    255     1       
+new    DE      Himmelm\9fhle \8a\9a\9f\80\85\86§     50.625865       13.060611                       -99999999.00    255     1       
+new    EO      Trasercado de la loka ret       50.495281       13.027645                       -99999999.00    255     1       
+new    ES      Matalasca\96as Navegaci\97n T\87liga  37.007446       -6.558838                       -99999999.00    255     1       
+new    FR      Boissi\8fre-\83cole Contr\99le  r\8eseau M\89le   48.679047       1.652069                        -99999999.00    255     1       
+new    HR      Pregledavanje lokalne mre$e     50.477937       12.510391                       -99999999.00    255     1       
+new    HU      H\9bgy\8esz Vez\8erl\9bk\9azpont H\87l\97zat  46.491394       18.424072                       -99999999.00    255     1       
+new    IS      Borgarfj\9arður   65.522461       -13.823547                      -99999999.00    255     1       
+new    SK      Ovl\87dacie centrum       50.724214       13.524871                       -99999999.00    255     1       
+new    X1      $ð\83\8eË\88é\8fô\9då\89æ\90ë\94\80\8aè\91\85\9a\86\9f®¾\81\8c¯¿\82\8d\84\96²³½\83× 50.497971       13.027725                       -99999999.00    255     1       
+new    X2      $ð\83\8eË\88é\8fô\9då\89æ\90ë\94\80\8aè\91\85\9a\86\9f®¾\81\8c¯¿\82\8d\84\96²³½\83× 50.497971       13.027725                       -99999999.00    255     1       

diff --git a/gpsbabel/tmpro.c b/gpsbabel/tmpro.c
index d1bb33fe7f282ebaec647df6c6b7aa21eeebffbc..73c23e7380528ada3c2b9b670c0cdeb1cf00ada8 100644 (file)
--- a/gpsbabel/tmpro.c
+++ b/gpsbabel/tmpro.c
@@ -218,7 +218,7 @@ tmpro_waypt_pr(const waypoint * wpt)
            wpt->altitude,
            colour,
            icon,
-           wpt->url
+           wpt->url ? wpt->url : ""
        );